Relative Content

Tag Archive for gitgithubatlassian-sourcetree

Merge a GIT feature branch without the main code into main

I’m having a git branch without the actual master code – the branch started from master code but i’ve deleted a lot of code in the branch due to needed time for debugging and so on, so the branch is now only new features.
How can i add the new features to the main branch? If i try to merge most of the code from the actual main is missing.
Do i have to do it manually now?

Git push file (e.g. Datasheet) to all branches

Short question: What is the best way to distribute a file (e.g. a datasheet, or a meeting protokoll) to all git branches or (would be the best maybe) to do this for a whole folder – so that there is a datasheet folder and it is always getting pushed to all branches.