I have a master and a NewReports branch. I've been working a lot on the NewReports branch, as well as on the master branch, so there's lots of conflicts to manage.
Let me know if this is good thinking: while in the NewReports branch, I would like to merge the master branch into it, so that when I eventually merge the changes from the NewReports back into the master branch, there's less to do.
I did run 'git merge master' from within NewReports. I started stepping through a p4merge but noticed there was a lot of stuff in there that I didn't want (in files that had already been merged). Example, there was some code in the master branch that got erased within the NewReports and got put back in when I did the merge. I assume this is because you should never merge this way - only merge stuff from branches into main lines?
Thanks for your input!