GIT: Merge two branches using netbeans

Question

I have two branches created at Bitbucket, one called master and another called modulo-contratos.

The thing is that the second branch has changes in some files that I need to integrate into master, but when I do a merge using Netbeans for it, it replaces my newest files in master with the older ones from the modulo-contratos branch.

What could I do?

score 3 · Answer 1 · answered Feb 13 '12 at 16:50

3

For git, the files from modulo-contratos must look "newer" than the ones in master. You probably edited them in the modulo-contratos branch after updating them in master.

You have several options:

Try to checkout modulo-contratos and merge with master (instead of the other way around). That might give better results.
Create a patch using the modulo-contratos branch and apply that to master. After that, merge and revert all changed files by replacing them with the version that you had before. This way, your master branch will be clean and the "time stamps" will be reset for the next round (so this won't happen again).

answered Feb 13 '12 at 16:50

Aaron Digulla

321,842
108
597
820

the first option didn't work. All I have left is to do the merging manually. – Anyul Rivas Feb 13 '12 at 19:42
You should spend some time to figure out what you did to break the merge, too, so it doesn't happen again. – Aaron Digulla Feb 14 '12 at 08:08

GIT: Merge two branches using netbeans

1 Answers1