What do you want to save?
Add Code snippet
New code examples
-
Shell/Bash 2022-03-02 03:20:02
merge master into feature branch
git checkout feature1 git merge master Add solution -
Shell/Bash 2021-11-15 23:15:14
update branch with master
git checkout master git pull git checkout mybranch git merge master # to keep mybranch in sync with master # then when you're ready to put mobiledevicesupport into master, first merge in master like above, then ... git checkout master git merge mybran... Add solution -
Shell/Bash 2021-11-15 20:43:24
checkout master with previous commit
git checkout 307a5cd # check out the commit that you want to reset to git checkout -b fixy # create a branch named fixy to do the work git merge -s ours master # merge master's history without changing any files git checkout master ... Add solution -
SQL 2021-10-26 12:36:11
database.merge in apex
List<Account> accList = new List<Account>{new Account(Name='Myacc1'),new Account(Name='MyAcc2')}; insert accList; Account masterAcct = [SELECT Id, Name FROM Account WHERE Name = 'Myacc1' LIMIT 1]; Account mergeAcct = [SELECT Id, ... Add solution -
Shell/Bash 2021-10-09 17:00:05
merging branches in git
//Make sure you are in your branch. Develop is a a branch in this case git checkout master Switched to branch 'master' git pull To pull changes of team members to your master git checkout develop git merge master Resolve Conflicts in develop git check... Add solution -
Shell/Bash 2021-09-30 16:45:05
git sync branch from master
git checkout master git pull git checkout mybranch git merge master # to keep mybranch in sync with master # then when you're ready to put mobiledevicesupport into master, first merge in master like above, then ... git checkout master git merge mybran... Add solution
Best helpers
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5