Merge Branch into Master

Source: https://stackabuse.com/git-merge-branch-into-master/
https://stackoverflow.com/questions/5601931/what-is-the-best-and-safest-way-to-merge-a-git-branch-into-master

This is a very practical question, but all the answers above are not practical.

Like

git checkout master
git pull origin master
git merge test
git push origin master

This approach has two issues:

1. It's unsafe, because we don't know if there are any conflicts between test branch and master branch.
2. It would "squeeze" all test commits into one merge commit on master; that is to say on master branch, we can't see the all change logs of test branch.

So, when we suspect there would some conflicts, we can have following git operations:

git checkout test
git pull 
git checkout master
git pull
git merge --no-ff --no-commit test

Test merge before commit, avoid a fast-forward commit by --no-ff,

If conflict is encountered, we can run git status to check details about the conflicts and try to solve

git status

Once we solve the conflicts, or if there is no conflict, we commit and push them

git commit -m 'merge test branch'
git push

But this way will lose the changes history logged in test branch, and it would make master branch to be hard for other developers to understand the history of the project.

So the best method is we have to use rebase instead of merge (suppose, when in this time, we have solved the branch conflicts).

Following is one simple sample, for advanced operations, please refer to http://git-scm.com/book/en/v2/Git-Branching-Rebasing

git checkout master
git pull
git checkout test
git pull
git rebase -i master
git checkout master
git merge test

Yep, when you have uppers done, all the Test branch's commits will be moved onto the head of Master branch. The major benefit of rebasing is that you get a linear and much cleaner project history.

The only thing you need to avoid is: never use rebase on public branch, like master branch.

Never do operations like the following:

git checkout master
git rebase -i test

Details for https://www.atlassian.com/git/tutorials/merging-vs-rebasing/the-golden-rule-of-rebasing

appendix:

• if you are not sure about rebasing operations, please refer to: https://git-scm.com/book/en/v2/Git-Branching-Rebasing

To summarize, here are the commands to create a new branch, make some commits, and merge it back into master:

$ git checkout master
$ git branch new-branch
$ git checkout new-branch

# ...develop some code...

$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch

Job name “..getProjectMetadata” does not exist

Source: https://stackoverflow.com/questions/59447679/an-unhandled-exception-occurred-job-name-getprojectmetadata-does-not-exist

I had this error after npm audit found vulnerabilities in the version of @angular-devkit/build-angular that I was using. I ran npm audit fix which updated it to 0.900.2, but when I ran ng serve it gave the error quoted in the question.

I resolved it by downgrading to version 0.803.25. This was the highest version I could find which did not cause any errors when running ng serve. The vulnerabilities found by npm audit are resolved in this version.

This is the command I ran:

npm i @angular-devkit/build-angular@0.803.25

res.json() doesn't always return the response to the client

Source: https://github.com/expressjs/express/issues/3060

server.get('/',(req,result)=>{
result.status(200).json(jsonObj);
result.end();
});
this is my code where jsonObj contains the json file. But it doesn't display in client side.

Multiple recaptcha same page

Source: https://www.okler.net/forums/topic/multiple-recaptcha-same-page/

<script src="https://www.google.com/recaptcha/api.js?onload=CaptchaCallback&render=explicit" async defer></script>
<script type="text/javascript">
    var CaptchaCallback = function() {
        grecaptcha.render('g-recaptcha1', {'sitekey' : 'YOUR_API_KEY'});
        grecaptcha.render('g-recaptcha2', {'sitekey' : 'YOUR_API_KEY'});
    };
</script>