LinuxQuestions.org
Latest LQ Deal: Linux Power User Bundle
Go Back   LinuxQuestions.org > Forums > Non-*NIX Forums > Programming
User Name
Password
Programming This forum is for all programming questions.
The question does not have to be directly related to Linux and any language is fair game.

Notices


Reply
  Search this Thread
Old 06-08-2012, 03:42 AM   #1
mzh
Member
 
Registered: Apr 2011
Location: Copenhagen
Posts: 71

Rep: Reputation: 0
Git merging feature 1 and feature 2


Dear Linux users
I have a conceptual problem getting this:
say in Git I have a working Master, and a branch dev_button1. Now I

git checkout master (back on master)
git checkout -b dev_button2 (i want to implement another button)

so I have three branches. I implement button2 and merge it with master and continue with button1. But then, button 2 is not in dev_button1, and once I finish that and merge it with master, I will loose button2, no?

Thanks for any hints.
 
Old 06-08-2012, 03:57 AM   #2
pan64
LQ Guru
 
Registered: Mar 2012
Location: Hungary
Distribution: debian/ubuntu/suse ...
Posts: 9,892

Rep: Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921Reputation: 2921
I do not really understand your question. Merging means the changes what you have made in branch1 will be integrated into another (master) branch. Merging another branch (branch2) will do similar task: the new code from branch2 will be also integrated into the master branch. You will not loose the result of the previous branch, but they will be merged together.
 
  


Reply


Thread Tools Search this Thread
Search this Thread:

Advanced Search

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is Off
HTML code is Off



Similar Threads
Thread Thread Starter Forum Replies Last Post
Sendmail - FEATURE(`dnsbl') - Creating exceptions while using FEATURE(`dnsbl') amonamarth Linux - Server 0 01-25-2010 02:21 PM
feature inquiry evrgreen Linux - General 5 05-04-2009 09:59 AM
Best new F7 feature monsm Fedora 8 06-04-2007 06:47 PM
gaim feature vexer Linux - Software 7 03-08-2005 12:08 AM
feature request fragger Slackware 2 08-25-2004 07:10 AM

LinuxQuestions.org > Forums > Non-*NIX Forums > Programming

All times are GMT -5. The time now is 02:21 AM.

Main Menu
Advertisement
My LQ
Write for LQ
LinuxQuestions.org is looking for people interested in writing Editorials, Articles, Reviews, and more. If you'd like to contribute content, let us know.
Main Menu
Syndicate
RSS1  Latest Threads
RSS1  LQ News
Twitter: @linuxquestions
Facebook: linuxquestions Google+: linuxquestions
Open Source Consulting | Domain Registration