1
vote
1answer
109 views

Tortoise CVS merge branches

I have two branches DEVELOPPEMENT and DEVELOPPEMENT2. I would like to merge DEVELOPPEMENT and DEVELOPPEMENT2 into a same branch but not in the HEAD yet. How to do it with the Tortoise HMI? I ...
0
votes
1answer
165 views

How can I automatically compare and merge a large number of text files?

Due to a series of technical snafus with Dropbox and Simplenote syncing, my main writing folder, which contains text files mostly in Markdown format, is all messed up. I have about 500 unique files, ...
1
vote
0answers
2k views

Excel with Version Control - Best way to merge excel files?

What is the best way to allow multiple users to edit the same excel file and later merge the files together with conflict resolution?
2
votes
1answer
70 views

Merge master functionality into shared branches in Git

Suppose that I have several shared branches on my Git repository, for example: newfeature, experiment and gtkgui, and I share those branches in the origin repository. My team and I make some changes ...
30
votes
1answer
23k views

GIT merge master into a branch

I have been developing a new feature on a new branch, on the side I have committed quite a few changes on my master branch. I would like to know if it's possible to merge the master branch in my new ...