-
I runned the following on a `--mirror` clone of my repository:
```shell
$ bfg --replace-text passwords.txt my-repo.git
$ cd my-repo.git
$ git reflog expire --expire=now --all && git gc --prune=n…
-
There are various ways git can encounter a merge conflict. We should make sure the labels make sense and the merge editor can be opened in all cases.
Currently, by default, the labels are "incoming" …
-
Currently, we plan to queue the PREPARE stage upon git commits to the chaincode-bootstrap repository. In future we should optimize the pipeline such that the PREPARE stage is queued upon git commits t…
-
**Version info**
Windows 10 21H1, 19043.1237
Sublime Merge Build 2059
**Description**
Commits keeps showing 'Loading changes' - No modified/new files shown in Sublime Merge even though the work …
-
- VS Code Version: 1.53.2
- OS Version: 19042.746
As what the title described, I have encountered several times: when I use VSC to merge 2 branches, either with conflicts or not, the c…
-
**Describe the issue**
The current approach to associate commits with the pull requests is the following:
1. Fetch the commits.
2. Fetch the pull requests.
3. Check if the `merge_commit_sha` o…
orhun updated
3 months ago
-
Type: Bug
1. Use git.rebasewhensync: true.
2. Create branch 'test' from Master, commit something to branch 'test'
3. Commit something to Master
4. Switch to branch 'test'
5. Merge changes from …
-
When merging a developer feature branch into a release branch (off master), this plugin throws an error.
In the section looking for merge commits, get the following error:
```
++ git log releas…
-
How to reproduce:
- create a new project (choose none / empty / own when asked) and choose external repository (must contain some code)
- Divio bot will push some commits (see #53 )
- locally, do a…
-
*Originally reported by* **Anthony Sottile (Bitbucket: [asottile](https://bitbucket.org/asottile), GitHub: [asottile](https://github.com/asottile))**
----------------------------------------
Now to …