I need this one day: [WayBack] git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
–jeroen
Archive for the ‘DVCS – Distributed Version Control’ Category
git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
Posted by jpluimers on 2018/12/18
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Reminder to self: make a list of URL suffixes to show branch diagrams of repositories
Posted by jpluimers on 2018/12/18
One of the BitBucket features I like a lot is that in the commit history, you see the branches involved in a nice diagram on the left side of the commits: https://bitbucket.org/pypy/pypy/commits
BitBucket used to be popular to host public repositories, but from a public perspective, they are on the decline for that (they even removed the [once popular] bitbucket.org/explore page and [WayBack] will not re-introduce it).
Right now, only major git based hosters still have explore pages:
- https://gitlab.com/explore
- https://github.com/explore and https://github.com/trending (it [used to be called] https://github.com/repositories)
So it makes sense to see where they provide diagrams of branches, so here are some examples to go from a project to the graph:
- https://bitbucket.org/pypy/pypy
- https://gitlab.com/gitlab-org/gitlab-ce
- https://gitlab.com/gitlab-org/gitlab-ce/network/master (in the Web UI you click on Repository, then on Graph)
- https://github.com/gitlabhq/gitlabhq
- https://github.com/gitlabhq/gitlabhq/network (in the Web UI, click on Insights->Graphs, then wait and click on Network; if there are many branches, this page will not load)
- https://github.com/python/cpython
–jeroen
Share this:
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, GitHub, GitLab, Mercurial/Hg, Software Development, Source Code Management | Leave a Comment »
It looks like the PlasticSCM people are building a git-client, but it needs on-line installation and registration
Posted by jpluimers on 2018/12/15
gmaster is an interesting Windows based git client, but you cannot install it off-line, and by default it does not use the external git.exe.
See the below tweets.
- [WayBack] GMaster-installer.exe via `wget https://gmaster.io/Installer` fails · GitHub
- [WayBack] Daniel Ulfe on Twitter：”ssh does not seem to work for me, I get “…input is not a valid Base-64 string…”. Same public/private keys worked fine in command line. #SadGMastering via @gmasterscm”
- [WayBack] Carlos. on Twitter：”Please check the following twit with the instructions to configure gmaster to use git.exe by default for the pull/push operations. It should help: https://t.co/PYj1A25nhr… “
- [WayBack] Ruben de Alba on Twitter: «The problem is that gmaster doesn’t use git.exe by default for the pull/push operations. To enable it, just copy the following entries inside the [git.exe] section in the gmaster config file: clone.enabled=true fetch.enabled=true pull.enabled=true push.enabled=true… »
- [WayBack] Carlos. on Twitter：”Please check the following twit with the instructions to configure gmaster to use git.exe by default for the pull/push operations. It should help: https://t.co/PYj1A25nhr… “
- [WayBack] gmaster git gui client on Twitter “If you are using gmaster and you love it… help us spread the word with this new video 📺📺📺… “
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, PlasticSCM, Software Development, Versioning | Leave a Comment »
git – How to store releases/binaries in GitLab? – Stack Overflow
Posted by jpluimers on 2018/12/12
[WayBack] git – How to store releases/binaries in GitLab? – Stack Overflow: yes you can, but on gitlab.com they are limited to a whopping 10 megabytes in size.
See:
- [WayBack] Update GitLab.com config for attachment file size limit from 10MB to 200MB+ (#2654) · Issues · GitLab.com / GitLab.com Support Tracker · GitLab
- [WayBack] Update GitLab.com config for attachments in tags file size limit from 10MB to 200MB+ (#39938) · Issues · GitLab.org / GitLab Community Edition · GitLab
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, GitLab, Source Code Management | Leave a Comment »
[solved]Where is my user ID in GitLab.com? – HowTo – GitLab Community Forum
Posted by jpluimers on 2018/12/06
Try https://gitlab.com/api/v4/users?username=??? where
???is your username. This will only work if you are already logged into gitlab.Alternatively,
- go to https://gitlab.com/profile/account and copy your Private token.
- Then run the following command from a bash-like terminal:
curl --header "PRIVATE-TOKEN: AAAA" https://gitlab.com/api/v4/users?username=BBBB
where AAAA is your private token and BBBB is your username.
Source: [WayBack] [solved]Where is my user ID in GitLab.com? – HowTo – GitLab Community Forum
Works:
- https://gitlab.com/users/sign_in
- https://gitlab.com/api/v4/users?username=wiert
- You can even use this for a a different username, for instance this GitLab team member: https://gitlab.com/api/v4/users?username=northrup
Via the ID, you can find the issues assigned to the user:
- https://gitlab.com/dashboard/issues?assignee_id=885618
- https://gitlab.com/dashboard/issues?assignee_id=478289
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, GitLab, Software Development, Source Code Management | Leave a Comment »
Some links that might help migrating from Mantis to GitLab
Posted by jpluimers on 2018/11/29
I might give a few of these a shot:
- [WayBack] Mantis to Gitlab converter | XRunHProf
- [WayBack] nonplus/mantis2gitlab: Script for importing Mantis Issues into GitLab
- [WayBack] Utils / mantis-to-gitlab · GitLab A script to import Mantis issues (from CSV) into GitLab.
- [WayBack] emilrising/mantis-to-gitlab: A mantis to Gitlab migration script written in PHP
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, GitLab, Software Development, Source Code Management | Leave a Comment »
Protected Branches | GitLab
Posted by jpluimers on 2018/11/26
[WayBack] Protected Branches | GitLab usually are a cool feature, but sometimes they get in the way, for instance when someone having enough rights has pushed credentials or API keys to a repository.
Unlike the picture in the documentation that indicates the default looks like Masters, this is now assigned to the role Maintainers.
Wrong:
Right:
More reading:
- [WayBack] Protected branches API | GitLab
- [WayBack] How GitLab Permissions and Protected Branches Keep Your Code Safe | GitLab
- [WayBack] Permissions | GitLab
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, GitLab, Source Code Management | Leave a Comment »
A repository with a hierarchy or modules referencing each other might not be a good idea
Posted by jpluimers on 2018/11/20
When creating a library of libraries where the libraries use parts of the other libraries creates a mess when organised as a repository with subrepositories having other subrepositories.
It might be better to have one big repository containing a suite of functionality. This is why darkThreading became part of darkGlass: [WayBack] Why no git submodules for the libraries it depends on? · Issue #1 · chapmanworld/darkThreading · GitHub:
You might want to maintain that suite as one big versioned repository, with a different means of structuring it than a tree of submodules. That way you can keep the more complex interdependencies between the parts you have now.
Example of the mess: [WayBack] Duplicate submodules with Git – Stack Overflow
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Where does my git question go? – Programmers Meta Stack Exchange
Posted by jpluimers on 2018/11/20
StackOverflow / StackExchange is growing too large:
You’ve got a question about git. Its not uncommon, lots of people have questions about git. But where should the question be asked?
Source: Where does my git question go? – Programmers Meta Stack Exchange
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Opinions, Pingback, Software Development, Source Code Management, SourceTree, Stackoverflow | Leave a Comment »
When git fails to `fetch all`
Posted by jpluimers on 2018/10/26
“fetch all”
A SourceTree fetch all actually comes down to this:
git -c diff.mnemonicprefix=false -c core.quotepath=false fetch --tags origin
Despite being such a big command-line, it sometimes doesn’t find new remote branches and you end up with a situation like this:
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management, SourceTree | Leave a Comment »
The Wiert Corner - irregular stream of stuff 