Tool for pull request/code review with multiple repositories?
Is there an available tool that is able to create Code Review/Pull Requests/Merge Request from multiple Git repositories like
post-review used inside Amazon(documentation here)?
GitHub/Gitlab are oriented to individual/small team development(by today) and doesn't provide such essential feature which is necessary for companies developing multiple projects or multiple teams, although there are asks from Gitlab users to create such advanced Merge Requests: Issue 1, Issue 2.
Does anyone know an advanced source code versioning and reviewing tool/service being able to perform that?
There is no such feature to pull request or code review across multiple repos (unless and fork repo and the original repo) for github/gitlab.
The work around for the situation is adding the branch from another repo into the current repo which you want to create pull request and code review:
# In local current repo git remote add another <URL for another repo> -f git checkout -B newbranch another/branchname git push -u origin newbranch
Then you can create a pull request to merge the
newbranchinto the branch (such as
master) which is original existing in current repo.
See also questions close to this topic
Ignore a specific package while installing dependencies using 'npm install'
I have a node package
react-native-push-notificationfor which i have made some changes in the packages to fulfil my requirement. But every time i do a
npm installthe new (original package without my changes) package overlaps with my current package.
Is there any way i can restrict
npm installto ignore my modified package? And also i want to push this package to git.
Any lead will be highly appreciated.
Why does github detect two authors but not sourcetree?
So basically I did an
git --amend --no-editfrom a second computer, tho I do have the same name and email on git, and Github detected a second author, while Sourcetree does not show me any second author.
If I execute
git log --format='%aN' | sort -u, which would show me all the authors, only one appears, just like in Sourcetree.
Why is this?
Here are some screenshots:
Is it possible to undo, undone changes in visual studios git?
so I accidentally right clicked a file in my visual studios and pressed undo. I think this :
- Discard uncommitted changes to a file, bringing the file back to the version in the last commit.
- Reset your local branch to a previous commit.
- Revert changes pushed to a remote branch and shared with others.
The question is, can I undo what I have undone? Is it possible to get the file back in which I pressed undo?
How to track only specific files on a git branch automatically
I have a master branch and a few working branches which each should implement a specific feature and then be merged into master and deleted.
The problem I have is that the working branches track all the files that are also on master, and whenever master gets updated, I have to manually merge master into all other working branches to keep them up-to-date, even if none of the files relevant to the working branche's feature got affected.
Is there a strategy with which I can only track specific files on a branch and keep other files free to be updated by other branches? Is there a better way than using .gitignore, which would always have to be manually updated to ignore/include specific files? I would like to automatically track only those files which have changes committed on that branch.
Git how to revert staged /unstaged modified file
In Git(2.16). Suppose, I modified a single file and did not stage yet I would like to revert the file back to original? Also, how can I accomplish this on a staged file? Thanks.
Git restructure commits
I have the following scenario
Branch A: c1, c2
Branch B: c1, c2, c3, c4
Branch D: c1, c2, c3, c4, c5, c6
Now, branch D was meant to branch from Branch A, but I mistakenly branched from branch B. The commits, c5 and c6 are not related to commits, C3 and c4.
How do I go about making a new Branch, E, from Branch A, and moving just commits C5 and C6 over to this new branch such that it is structured like this:
Branch E: c1, c2, c5, c6
Git (VisualStudio) - Merging develop to feature before pull request detects incorrect changes
We've got a project in which we have the following branch structure:
Sometimes, while working on a feature, develop gets updated with some new code. So, before making a push operation and, then, a pull request, we first merge develop into feature branch, so we get the last updates and solve the possible conflicts locally.
As the merge brings all the updates to the local code, they are detected as changes inside the branch, because before the merge the changes weren't present on this (they were present on develop, but not on my branch).
So, when we make the pull request, what comes as "new changes" are ALL the changes: the local changes we had, and the changes merged from develop that have been added to the branch. This means that the code reviewers will see a lot of files to review (maybe 20 files are marked as "have changes", while the pull request should only have 2 files changed, for example).
How can we make it so we have all the latest changes and our branches up to date before pushing the code - so we can resolve conflicts locally -, but being able to review only the code that really has changed from develop branch?
We are using Microsoft Visual Studio Git framework ([company].visualstudio.com website).
If any further information is needed, tell me and I'll add it as soon as possible!
In a multi small project environment how scrum should be followed?
In our team we are developing test suites. Each test suite will have multiple automated test cases. So we can consider each test suite as a single small project.
Currently each person in a team is owning one test suite and working the tasks in it. When we raise code review ,it takes long time to get it reviewed as members have their own work and in their free time they do code review.
I am feeling that we are following scrum in a wrong way. Instead of each person having one project , i think a team should first take one test suite then the tasks in it can be split between members and complete it. Then move to next test suite.
Is my thought correct? I need to suggest the team to follow the right approach. Can some one from practical perspective whether following scrum in such a way that each member is working in different suites is right?
The challenge here is 3 members in our team in one country and remaining people in another country.
Cannot install CodeReview with pip
I'm following the steps in this tutorial. I installed visual C++ from the link in the installation bash. But I got always this error when I rerun
pip install CodeReview
copying CodeReview\GUI\Widgets\MessageBox.py -> build\lib.win32-3.6\CodeReview\GUI\Widgets copying CodeReview\GUI\Widgets\__init__.py -> build\lib.win32-3.6\CodeReview\GUI\Widgets copying CodeReview\Config\logging.yml -> build\lib.win32-3.6\CodeReview\Config running build_ext building 'CodeReview.PatienceDiff._patiencediff_c' extension creating build\temp.win32-3.6 creating build\temp.win32-3.6\Release creating build\temp.win32-3.6\Release\CodeReview creating build\temp.win32-3.6\Release\CodeReview\PatienceDiff C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.13.26128\bin\HostX86\x86\cl.exe /c /nologo /Ox /W3 /GL /DNDEBUG /MD -Ic:\python36\include -Ic:\python36\include "-IC:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.13.26128\include" /TcCodeReview/PatienceDiff/_patiencediff_c.c /Fobuild\temp.win32-3.6\Release\CodeReview/PatienceDiff/_patiencediff_c.obj _patiencediff_c.c CodeReview/PatienceDiff/_patiencediff_c.c(25): fatal error C1083: Impossible d'ouvrir le fichier include▒: 'stdlib.h'▒: No such file or directory error: command 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Tools\\MSVC\\14.13.26128\\bin\\HostX86\\x86\\cl.exe' failed with exit status 2 ---------------------------------------- Command "c:\python36\python.exe -u -c "import setuptools, tokenize;__file__='C:\\Users\\PC\\AppData\\Local\\Temp\\pip-build-v112933u\\CodeReview\\setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" install --record C:\Users\PC\AppData\Local\Temp\pip-1jck99f1-record\install-record.txt --single-version-externally-managed --compile" failed with error code 1 in C:\Users\PC\AppData\Local\Temp\pip-build-v112933u\CodeReview\
I don't understand why this error occurs to me.
Keeping a collection of mercuial subpreos at tip
I would like to keep a collection of mercurial subprepositories updates at
tipand this is what I've come up with. Are there any gotchas I'm not seeing if I do it this way?
For many years now I have been using monolithic subversion repository
mainbut I am getting ready to convert it over to mercurial. The only thing I don't like about mercurial is that I can't clone just one subdirectory. I was thinking of making each top level directory of
maininto its own mercurial repository. Then I could create one mercurial repo called
maincollectionsthat would reference each new mercurial repo as a subrepo. In order to get changes to any subrepo by just pulling once inside
maincollectionsI set up the following.
When a push is received on the server in any one of the subrepos it triggers thecommit-subs
commit-subto force an update and commit of
#!/bin/bash SUBNAME=$(basename $(pwd)) cd ../../maincollection/$SUBNAME hg pull hg up cd .. hg ci -m "Automated update of .hgsubstate"
maincollection # repo with subrepos main/* # Individual subrepos
Verify if a tag was done in the master branch
In this project I am working, we do deployments based on tags. Whilst it's obligatory that the tags are done against the master branch (after you merge the release there), sometimes by mistake someone can tag against a dev or release branch, which is incorrect. That causes several problems.
In our deployment script, there is a step in which we do clone a specific tag from git, using a process like the one described in this question: Download a specific tag with Git
$ git clone $ git checkout tags/<tag_name>
How can I amend this script to check if this tag was actually done against the master branch? I would like to then stop the deployment and throw an error if the branch is not the master.
In hg how do I pull all remotes/paths in one command?
I'm looking for the equivalent of
git fetch --all. I currently have three different remote paths configured for my repository.
hg pathsshows all three. How do I do
hg pull --allto fetch the new change sets from all remote repositories?