GIT how to smerdzhit?

Question

git

Good afternoon!
There is a remote git repository with two branches - oldbranch and newbranch. All active work is now going on in the newbranch branch. How to merge correctly so that newbranch actually ends up in oldbranch? For the reverse situation, it would go something like this:
git checkout oldbranch
git merge newbranch --strategy=ours
git branch -d newbranch
But there is no --strategy=theirs parameter in git

Answer 1

Got it done like this

git checkout newbranch
git merge --strategy=ours oldbranch
git checkout oldbranch
git merge newbranch

Answer 2

-Xtheirs?

Answer 3

api.audioaddict.com/v1/di/track_history/channel/3.json will
only have to be proxyed due to a cross-domain request.

Answer 4

Need more details. Since I don't believe in miracles, here's an example of how such things should be googled.
1) you need to find out what streams data we have in order to understand what you are dealing with. We get the response headers from the server and see there:
2) see if this is possible and if there are ready-made solutions: stackoverflow.com/questions/4911062/pulling-track-...
3) from point 2 we understand that we need to get the StreamTitle, google further .
Personally, I did not find a ready-made solution right away. Keep searching. There is another option to use the API provided by icecast but I'm honestly not sure. Need to try.