All Questions
41 questions
0
votes
0
answers
23
views
Working with two git repos on same server but without a bare-repo
I've been working for a while with git and multiple remote repos, cloned form a bare-repo. So, I could commit changes on one repo, push to the bare and fetch/merge into the other repo.
On a new, small ...
- 2,745
0
votes
0
answers
44
views
After merging a repo into another repo, git push fails due to bad committer data (Complaining about commits by other users from repo A)
I merged the master branch of repo A into repo B feature branch locally.
Master Branch of Repo A has 1000's of commits by many different committers.
I followed the general merge guidances like this ...
- 432
1
vote
1
answer
2k
views
How to undo code that is pushed to main branch and merged
I want to undo my push to the main branch which is merged as well.
Note: I remember that pushing to the main branch isn't a good practice, but there were some commits showing in my main branch of the ...
- 432
-1
votes
1
answer
83
views
My local branch is not able to synch with master
I am working on local branch name is local1 .I wrongly deleted one file which exists in master from my local branch and then pushed update to my local branch.
While raising PR it is showing file is ...
- 207
2
votes
1
answer
534
views
How can I push the local repo changes to remote repo and remote has already updated files which I don't have?
How can I push the local repo changes to remote repo and remote has already updated files which I don't have? We are working in a team so continuously there are changes that need to be pulled first ...
0
votes
1
answer
183
views
How to revert back to an old commit in remote after a wrongful merge?
I am using BitBucket as my remote repo. One of my training team members mistakenly pushed another branch into the master. Now, this is how my repo looks like.
Well, he made a huge mess. I want to ...
- 23.1k
0
votes
1
answer
739
views
Git + Pycharm, push rejected error, files all gone
I am newbie programmer who uses Pycharm.
There's a function that made me able to connect my Pycharm and GitHub repository.
I didn't know how Git works, and I wanted to upload (push?) my codes and ...
0
votes
0
answers
111
views
Git - can't push after interactive rebase
I have a develop branch and a feature branch. I did some commits to develop branch after I created the feature branch from the develop branch. And also did some commits to feature branch. So the ...
0
votes
1
answer
1k
views
Mirror repository to subfolder in another repository
Assume I have repository 'A' in gitlab. Developers will often push code changes to repository 'A'.
I have another repository 'B' in same gitlab.I have subfolder 'C' in repository 'B'.Whenever ...
1
vote
1
answer
908
views
Local Commits after merging
I was working on a feature branch (let's call it DEV-1234), not yet made any changes, came back to work after a few days break and of course the develop branch had a huge amount of changes in it which ...
- 3,548
0
votes
1
answer
737
views
How to merge and push a local branch in git
Hi I am in difficulty with this scenarios:
I have two local branch: develop and branch1. On remote I have develop branch only.
The steps that i followed:
I have pulled remote develop from my local ...
- 21
0
votes
2
answers
761
views
How to push in the middle of git merge, when too many files are to be merged
After a long time, I updated my branch.
I got over a hundred conflicts.
I want to resolve to say 10 or 15 of them and then push it. (I will be doing it over several days).
Is there a way to commit/...
- 933
3
votes
2
answers
2k
views
What should I do to get source code from the last pushed commit?
I thought I know simple features of git until I began work with other contributors:)
The situation is as follows:
I pulled source code from repository (from commit: 2c49868).
I changed some of the ...
- 374
1
vote
1
answer
305
views
How to push & merge specific commit history?
I cloned a Repo from Perfoce into Git locally with all its history, call it SubProj, and then I pushed it to a remote repo, and used that remote repo to merge SubProj under a SuperProj.
There is no ...
- 1,329
0
votes
2
answers
47
views
How to work with a remote repository containing many branches?
Let us assume that a remote (central) repository has several branches and in the beginning I have locally the exact copy of the remote repository.
Now I want to change something in one of the ...
- 132k