Tag: git merge

Git squash merge or git force push?

We’re using gitlab. Master branch is protected and only project owners can commit/accept merge requests to the master. Other developers send a merge request to get their code into master. When we send for merge requests (from a feature branch to master), one of the developers review the code. If there are any suggestions/comments, the […]

Merging a Detached Head?

So I kind of messed up royally and created a detached head because I wanted to go back to a previous version of my code. Problem is: now I can’t push anything because my main branch is a detached head. If I try to merge the branches then it gets rid of the head and […]

Restrict developers access on GitHub repository

I have two branches on m GitHub repository. I wanted to restrict developers access to these branches, basically I want Team A to access on Branch1 and Team B to access Branch2, and I (as admin) can merge master branch with both these branches when required. Is this possible on Github so that TeamA and […]

Changes in upstream repo during open pull request ? (How) should I merge in my fork?

I’ve forked a repo on Github, added some code, pushed these changes to my remote repo and submitted a pull request to the upstream repo. While now waiting for the pull request to be handled I notice there happened some commits in the upstream repo. I should merge these commits back in my fork because […]

Git Merge and Missing changes

I’m a bit new to GitHub. Sorry in advance if this is a noob question. I have 2 branches, Dev and Master. I worked on Dev. When I wanted to merge with Master, I did the following: $ git checkout master $ git pull origin master $ git merge dev then i had a few […]

Correcting old merge mess in Git

We’re a small using Git and all us are new to it. In the month or two that we’ve used Git and began experimenting with feature branches and release branches, we’ve run into little spaghetti incidents like this one caused by merge conflicts, etc: The black line is my development branch. Ignore the red one. […]

Recovering a git merge?

I accidentally did git commit -a rather than git commit on a conflicted merge. In an attempt to reset it, I did a git reset –soft HEAD~. This didn’t do what I want. When I run git status I don’t see the conflicted files. How do I get back to the pre-git commit -a stage? […]

git merge piece by piece

I’m doing some private (lonely) development of a website on a git repo with a master and a development branch. I’ve done quite some work on the dev branch focusing on some “big” features and issues, and to be honest the commits on the dev branch have not been a showcase for atomic commits. That […]

How to use a Git merge tool to resolve react-native-git-upgrade conflicts?

I used react-native-git-upgrade to upgrade React Native on my project, the process left some conflict delimiters I have to solve now: DEAD_CODE_STRIPPING = NO; <<<<<<< ours HEADER_SEARCH_PATHS = ( “$(inherited)”, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, “$(SRCROOT)/../node_modules/react-native/React/**”, “$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager”, “$(SRCROOT)/../node_modules/react-native-video”, ); INFOPLIST_FILE = “MyAwesomeApp/Info.plist”; ======= INFOPLIST_FILE = MyAwesomeApp/Info.plist; >>>>>>> theirs LD_RUNPATH_SEARCH_PATHS = “$(inherited) @executable_path/Frameworks”; OTHER_LDFLAGS = ( “$(inherited)”, “-ObjC”, “-lc++”, ); […]

Cannot checkout branch or remove problematic files

I have 2 branches in my Java project: master and refactor. I’ve finished working on refactor so now would like to checkout master and merge refactor into master. While working on the refactor, I also added some files to .gitignore (one of them was .idea) and now I get: [michal@michal-pc MCleaner]$ git checkout master error: […]

Git Baby is a git and github fan, let's start git clone.