Tagged Questions

votes

2answers

15k views

GIT merge master into a branch

I have been developing a new feature on a new branch, on the side I have commited 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 ...

asked Dec 20 '10 at 15:03

mnml
4912718

newest branch conflicts questions feed

Technology			Life / Arts	Culture / Recreation	Science	Other
Stack Overflow Server Fault Super User Web Applications Ask Ubuntu Webmasters Game Development TeX - LaTeX	Programmers Unix & Linux Ask Different (Apple) WordPress Answers Geographic Information Systems Electrical Engineering Android Enthusiasts IT Security	Database Administrators Drupal Answers SharePoint User Experience Mathematica more (14)	Photography Science Fiction & Fantasy Seasoned Advice (cooking) Home Improvement more (13)	English Language & Usage Skeptics Mi Yodeya (Judaism) Travel Arqade (gaming) Bicycles Role-playing Games more (22)	Mathematics Cross Validated (stats) Theoretical Computer Science Physics more (7)	Stack Apps Meta Stack Overflow Area 51 Stack Overflow Careers

rev 2013.5.17.690

Tagged Questions

GIT merge master into a branch

Related Tags