.Net 7
178
Technology
100
SQL
51
Servers
38
Databases
35
Jobs
34
Questions
33
Entity Framework
26
Computer Programming
24
Docker
24
Network
19
Linux
18
Android
18
Machine Learning
13
Windows
12
Art
12
C-Sharp
12
Git
11
JavaScript
11
Home
9
HTML5
8
System Design
8
Machine-Learning
8
Research
8
Front-End
6
General
6
Algorithms
6
Docker-Compose
6
Bootstrap
5
Lunux
5
Software Development
5
MVC
4
Education
4
Hardware
4
Tools
3
IoT
2
Health
1
Writing
1
XML
1
Server
1
Other
1
Question
1
Join the Community
Git Branch Error: Resolve GitHub Branch Error
When GitHub Branch you created on the local machine gives you errors, this might happen when you develop and push your local branch to a remote repository, then the branch gets modified on another computer. When you pull the branch and merge, the error happens.
Solution:
- Create a new branch on a local machine
- Make sure there are no other application consuming the repository (Other clients like IDE, Other Git Client like GitKraken)
- Make your initial commit to make sure all files are committed to the staging area (git has a staging area, find out about it)
- After step 3, type: git reset --hard (This command will take you back to the last commit you made in case other files have been generated or tracked)
- Then do: git pull origin yourRemoteBranch
