gitkraken | RPM package for the git client GitKraken
kandi X-RAY | gitkraken Summary
kandi X-RAY | gitkraken Summary
RPM package for the git client GitKraken
Support
Quality
Security
License
Reuse
Top functions reviewed by kandi - BETA
Currently covering the most popular Java, JavaScript and Python libraries. See a Sample of gitkraken
gitkraken Key Features
gitkraken Examples and Code Snippets
Community Discussions
Trending Discussions on gitkraken
QUESTION
I'm trying to delete and remove the commits highlighted in the picture. However when I do interactive rebase and drop the commits it just makes the strand more complicated. How can I have one line of commits without the ones that I highlighted? By the way, some commits might have the same message but their source code is completely different. Please suggest both gitkraken and CLI git solutions.
This is the diagram I am sort of looking for EDIT This is the updated diagram
...ANSWER
Answered 2021-May-09 at 06:52Thing to know: origin/master
(the second master in your diagram) is not yours. It is the remote-tracking branch whose sole job is to reflect what's on GitHub. It is effectively the medium through which you fetch / pull and push. You cannot directly edit the remote tracking branch origin/master
at all. The real master
is yours, though.
So the first thing you need to do is get those commits onto a real branch, and we may as well use master
itself as the real branch:
On
master
, make a new branch to hold your place; let's call ittemp
.Now, still on
master
, do areset --hard
down to "removed console logging" (the higher one in the diagram). We have deliberately skipped past the unwanted merge commit, so it's going to be eradicated later along with the other "removed console logging".
Okay, now all the earlier commits you want to reshuffle are on master
and we can do our reshuffle:
Rebase interactive starting at "broadcasts typing", and drop "user typing".
Now
git cherry-pick temp
, and then force-delete thetemp
branch; you no longer need it.
Now master
looks the way you want!
So now you can push, thus reconciling the remote-tracking origin/master
to it; but you will have to use force because you have rewritten history. This has serious (possibly disastrous) consequences if you are sharing this branch with others, but those consequences were implicit in the question as posed and there's nothing we can do about it.
The real moral of this story is, don't push the main branch until your history really is the way you want it. If you don't know whether your history is settled, use more branches to experiment until you do know. Having to rewrite what you already pushed to GitHub is a really bad smell and suggests your work habits are incorrect.
QUESTION
I have an error during the LFS pull with Gitkraken on macOS. I get the following error message:
Error on LFS Pull git: 'lfs' is not a git command. See 'git --help'. The most similar command is log
In the Gitkraken documentation (here) we find the following explanation:
Note: If GitKraken still cannot find Git or Git LFS, the terminal or CMD may be using a different path than the system or user path. For example, on OSX applications launched from the GUI have a different path than those launched from the terminal.
To check this, we can do the following command: which git-lfs
and which git
Indeed, I get the following result:
...ANSWER
Answered 2021-Mar-30 at 00:59Your PATH
setting needs to refer only to directories, not to files. So if the git-lfs
binary is in /opt/homebrew/bin
, then you'd want to do this:
QUESTION
I haven't been able to find an answer to this in the GitKraken docs. During a rebase from my branch
to main
I'm getting a conflict that doesn't open up the conflict GUI and the message is vague.
When it says "Keep New Version" are the changes on my branch
"New"? Are the changes on main
"New"? Does this mean I'm adding something back into main that has already been deleted or moved? Thanks!
ANSWER
Answered 2021-Mar-22 at 16:29This can occur if one of the changes says "delete that file" and the other change says "update that file".
I wouldn't be able to tell you which side deleted the file, but if you wrote the code on branch
you probably know whether you deleted that file or updated it.
QUESTION
I've just started a new job where they use GitKraken. In the Remote origin we have a bunch of versions, and for each bug/feature we're going to work on we create a separated branch, which are placed within the feature subfolder in origin. Here a screenshot of that:
When I now create a new branch, and then want to push it to this origin, I get the following:
As you can see, it by default suggests to push it to origin, which is good, but after the slash it mentions the branch name directly as placeholder within the input-field.
I now change this input-field from the default (placeholder) abc-4398-abcdef
to a manual typed feature/abc-4398-abcdef
, but I wonder if there is a QOL option available in GitKraken to ALWAYS push to the feature branch within origin by default, unless manually changed? That way I could just click pull + submit in GitKraken, instead of having to type out feature/abc-1234-abcdef
manually every time I want to push a new feature/bug branch to origin.
ANSWER
Answered 2021-Mar-05 at 09:25When you create a new remote branch, the default name for the remote branch is the name of your local branch.
My guess is : the local branch you created is named abc-1234-abcdef
.
Name it feature/abc-1234-abcdef
instead, and the default name for the remote branch will be what you expect.
QUESTION
I am trying to re pull/merge some branches into my dev branch, after reverting them (numerous times) but git thinks that there are no changes to make and is already up to date, when it is not...
I have put myself in a situation that I don't know how to get out of:
standing in dev branch the entire time, using 'git pull origin foo' for merging and using GitKraken for the reverts
- merge branch X into dev and push (causes an issue with my build process)
- merge branch Y into dev and push (to see if issues persist with branch, but branch X already exists...)
- revert branch Y
- revert branch X
- push these together in one go
tries pulling/merging branches back again, but git pull says everything is up to date in dev
Now, at this point, I am back where I started before the merge, in terms of actual changes, however when I tried to re merge/pull stuff back in (in a different order) git says its already up to date (when it 100% is not).
So then I do the following (which is pointless)...
- revert the revert for branch X (step 4)
- revert the revert for branch Y (step 3)
- revert the original changes for branch Y (step 2)
- revert the original changes for branch X (step 1)
- push all at once
But the same issue persists now (and is nastier with all this in my history) and some other people have merged stuff into dev now as well.
In short, how can I get git to actually pull and pick up my merge changes after I reverted them?
...ANSWER
Answered 2021-Feb-18 at 19:41You keep saying it's not up-to-date; it 100% is. You told git to merge the branches, and then to make new changes that undo everything from those branches. That's an up-to-date state, because all of the commit IDs you're trying to merge in are already in the target branch.
If you revert a merge and then later want to redo the merge, you have two options:
Revert the revert commit. This is generally easier but you may or may not like the history it produces.
Rewrite the branch in new commits (with new commit IDs) so that you can "fool" git into thinking it hasn't already merged them in.
git rebase -f
can be useful here.
QUESTION
I am working for a new client and am trying to introduce Gitkraken but got stuck at an error where it says Pull Failed: failed to get server certificate: The handle is in the wrong state for the requested operation
.
Here is some context, I need to access a private repo outside company domain and for security reasons I can't use SSH or HTTP for that, only HTTPS and had a certificate installed to do so which I have done and works fine on git via command line and direct browser access.
I have looked on past questions about it (especially on Windows 7 and on Windows 10) but none of the paths provided have been successful so far.
Edit: I don't have admin access to the computer I want to use Gitkraken with. I am using Windows 10.
...ANSWER
Answered 2021-Feb-12 at 09:02Got in touch with Gitkraken support and this is a known issue. Unfortunately there is no ETA on when it is going to be fixed.
QUESTION
Gitkraken creates a malformed url when doing a pull edits to remote urls by adding a username and also appends ".git" to the end of the url making it malformed. Our remote repository urls don't have a ".git" on the end.
Example (no username or .git on the url for our Azure DevOps repos): ...ANSWER
Answered 2021-Jan-29 at 08:31If this behaviour is not configurable (and should be reported to GitKraken support), you might consider, as a temporary workaround, adding symlinks to your remote repositories
On the remote side:
QUESTION
I started a little project few weeks ago and today I wanted to see the number of commits I did in a specific branch. I had three branches (master, develop and laravel-authentication). I started with some commits on the master, switched to the develop branch, made some changes and then I wanted to start the authentication with laravel. I made an own branch, and when I was finished I merged it back into the develop branch. Now if i take a look on the number of commits I did, it also shows the commits I did on develop and master.
If I look at the graph, i can clearly see that I did 7 commits on the 'laravel-authentication' branch. But however it also shows up the commits from master and develop. I put some screenshots from GitLab and GitKraken so you can see what I mean.
Maybe I just don't understand how Git works, but maybe you guys can help me!
A small overview of the whole tree
...ANSWER
Answered 2021-Jan-27 at 23:49Maybe I just don't understand how Git works, but maybe you guys can help me!
I think yes, and I hope yes.
Suppose branch develop
has 10 commits in it. You branch off of develop
and create a branch called newbranch
. How many commits does newbranch
have in it? The answer is 10 (not 0). Now suppose you add 7 commits to newbranch
; it now has 17 commits. When you view the history of newbranch
, you will see those 17 commits. Git doesn't care that 10 of them are also on some other branch. The view you see in the first image that nicely color codes those 7 commits on one of your branches, is just a convenience that it can do because those commits are only on your branch and nowhere else. But all of the other commits are also in your branch.
Regarding your comment:
My goal was to see only the commits made in the branch 'laravel-authentication'.
First I think we should not use the word "made" there, because once you merge one branch into another, Git doesn't know or care what branch the commits were "made" on.
Regardless, it looks like the first image is providing that for you. Conceptually, what you want is to see all the commits on your branch that are not on some-other-branch-TBD. That number of commits could very well be different depending on which branch you compare to. For example, from a command line you could do something like this:
QUESTION
I have my repo stored on GitHub and visibility is public but since a few days when I try to open the repository on Gitgraken, it says that the repo I'm trying to open is private and it won't let me access it.
Things I have tried:
- I tried closing and opening Gitkraken.
- Uninstalled Gitkraken, removed the directory in AppData and reinstalled Gitkraken.
- Make sure that the repo is indeed public.
- I also tried opening the repo again by browsing to the directory rather than trying to open it from the recent projects.
However, it still displays that message.
I have tons of projects and that's the only project which gets this message.
ANSWER
Answered 2021-Jan-10 at 00:26Check if:
- GitKraken is using an HTTPS URL to access that repository
- if
git config credential.helper
is set
If other projects (under the same GitHub user account) are accessible from GitKraken, then it is not an authentication issue.
What remains could be a typo in the repository name.
Do check the GitKraken logs to see if there is any more clue.
QUESTION
I created the branch b1
from master
. After some commites pull-request was created, approved, merged into master
and deleted. But I still have b1
on local machine, which I dont't want to delete. And now I want to reopen branch with the same name b1
from master, but GitKraken
throws an error:
Cannot create the ref because it already exists.
How can I do it?
...ANSWER
Answered 2020-Dec-13 at 22:03You can't have two different branches with the same name.
You can either delete your existing branch : since it was merged into master, the complete history of this branch should be part of master
anyway,
or you can rename the existing branch on your local clone :
Community Discussions, Code Snippets contain sources that include Stack Exchange Network
Vulnerabilities
No vulnerabilities reported
Install gitkraken
Support
Reuse Trending Solutions
Find, review, and download reusable Libraries, Code Snippets, Cloud APIs from over 650 million Knowledge Items
Find more librariesStay Updated
Subscribe to our newsletter for trending solutions and developer bootcamps
Share this Page